Auto merge of #1492 - alexcrichton:issue-1491, r=huonw
authorbors <bors@rust-lang.org>
Wed, 8 Apr 2015 00:29:10 +0000 (00:29 +0000)
committerbors <bors@rust-lang.org>
Wed, 8 Apr 2015 00:29:10 +0000 (00:29 +0000)
Closes #1491


Trivial merge